examples/gtkdial/gtkdial.c gdk/gdkapplaunchcontext.c gdk/gdkpango.c

2008-08-12  Michael Natterer  <mitch@imendio.com>

	* examples/gtkdial/gtkdial.c
	* gdk/gdkapplaunchcontext.c
	* gdk/gdkpango.c
	* gtk/gtkcellrendererpixbuf.c
	* gtk/gtkcellrenderertext.c
	* gtk/gtkcellview.c
	* gtk/gtkcombobox.c
	* gtk/gtkfontsel.c
	* gtk/gtkinvisible.c
	* gtk/gtkliststore.c
	* gtk/gtktexttag.c
	* gtk/gtktexttagtable.c: remove dereferencing from some function
	pointers i missed before.

svn path=/trunk/; revision=21089

diff --git a/ChangeLog b/ChangeLog
index 2a271e4cfce01aacc75a7ae4cdde194d9600d505..6c7d6f078c3b1d1c3bb5b1cb12a172eab4e43e54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-12  Michael Natterer  <mitch@imendio.com>
+
+       * examples/gtkdial/gtkdial.c
+       * gdk/gdkapplaunchcontext.c
+       * gdk/gdkpango.c
+       * gtk/gtkcellrendererpixbuf.c
+       * gtk/gtkcellrenderertext.c
+       * gtk/gtkcellview.c
+       * gtk/gtkcombobox.c
+       * gtk/gtkfontsel.c
+       * gtk/gtkinvisible.c
+       * gtk/gtkliststore.c
+       * gtk/gtktexttag.c
+       * gtk/gtktexttagtable.c: remove dereferencing from some function
+       pointers i missed before.
+
 2008-08-12  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkaccellabel.c

diff --git a/examples/gtkdial/gtkdial.c b/examples/gtkdial/gtkdial.c
index fa035ee61f2d2d37b220f9f09d63c4f6ea0e0df7..87c8dbb56496840258e98687b1a38f0a4493dfbf 100644 (file)
--- a/examples/gtkdial/gtkdial.c
+++ b/examples/gtkdial/gtkdial.c
@@ -152,8 +152,7 @@ gtk_dial_destroy (GtkObject *object)
       dial->adjustment = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 GtkAdjustment*

diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 15a013b768a780ba6f066fe97b0c91414b6155bb..45a776c9769dbf4e671c89e82551674e6f913e40 100644 (file)
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -55,7 +55,7 @@ gdk_app_launch_context_finalize (GObject *object)
 
   g_free (priv->icon_name);
 
-  (*G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize (object);
 }
 
 static char *

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 0a484b535e44bcb31add27b6973c4b196b28af92..302eb9d3e01f687927070510e0fe99ac010948d6 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -99,9 +99,9 @@ gdk_pango_renderer_constructor (GType                  type,
   GObject *object;
   GdkPangoRenderer *gdk_renderer;
 
-  object = (* G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->constructor) (type,
-                                                                             n_construct_properties,
-                                                                             construct_params);
+  object = G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->constructor (type,
+                                                                          n_construct_properties,
+                                                                          construct_params);
 
   gdk_renderer = GDK_PANGO_RENDERER (object);
   

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index faffec5bc62280d0a51ea721d2626001cc62a001..87a73d673e682d18894119a504550d2fee6ff009 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -234,7 +234,7 @@ gtk_cell_renderer_pixbuf_finalize (GObject *object)
   if (priv->gicon)
     g_object_unref (priv->gicon);
 
-  (* G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize (object);
 }
 
 static void

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 9a3e4ae234a7e826ff69ef3610f5e4bf7881d051..3e47c910807c60f2919ded8082a9a7016fc82c33 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -605,7 +605,7 @@ gtk_cell_renderer_text_finalize (GObject *object)
   if (priv->language)
     g_object_unref (priv->language);
 
-  (* G_OBJECT_CLASS (gtk_cell_renderer_text_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_renderer_text_parent_class)->finalize (object);
 }
 
 static PangoFontMask

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index e5350a526a59bcc865ec2a730156e5da85e91bb2..08cd400a95d0520f349cfbd3dabe3d6980adf87a 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -306,7 +306,7 @@ gtk_cell_view_finalize (GObject *object)
   if (cellview->priv->displayed_row)
      gtk_tree_row_reference_free (cellview->priv->displayed_row);
 
-  (* G_OBJECT_CLASS (gtk_cell_view_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_view_parent_class)->finalize (object);
 }
 
 static void

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0907e66d9aa2919ce777f7f11d8c22965ae51e92..1255e7c0e113d09a456517a8099defbb7e33dc53 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1720,8 +1720,8 @@ tree_column_row_is_sensitive (GtkComboBox *combo_box,
 
   if (priv->row_separator_func)
     {
-      if ((*priv->row_separator_func) (priv->model, iter,
-                                      priv->row_separator_data))
+      if (priv->row_separator_func (priv->model, iter,
+                                    priv->row_separator_data))
        return FALSE;
     }
 
@@ -2902,8 +2902,8 @@ gtk_combo_box_menu_fill_level (GtkComboBox *combo_box,
       gtk_tree_model_iter_nth_child (model, &iter, parent, i);
 
       if (priv->row_separator_func)
-       is_separator = (*priv->row_separator_func) (priv->model, &iter,
-                                                   priv->row_separator_data);
+       is_separator = priv->row_separator_func (priv->model, &iter,
+                                                 priv->row_separator_data);
       else
        is_separator = FALSE;
       
@@ -3463,8 +3463,8 @@ gtk_combo_box_menu_row_inserted (GtkTreeModel *model,
     }
   
   if (priv->row_separator_func)
-    is_separator = (*priv->row_separator_func) (model, iter,
-                                               priv->row_separator_data);
+    is_separator = priv->row_separator_func (model, iter,
+                                             priv->row_separator_data);
   else
     is_separator = FALSE;
 
@@ -3555,8 +3555,8 @@ gtk_combo_box_menu_row_changed (GtkTreeModel *model,
   item = find_menu_by_path (priv->popup_widget, path, FALSE);
 
   if (priv->row_separator_func)
-    is_separator = (*priv->row_separator_func) (model, iter,
-                                               priv->row_separator_data);
+    is_separator = priv->row_separator_func (model, iter,
+                                             priv->row_separator_data);
   else
     is_separator = FALSE;
 
@@ -4357,8 +4357,8 @@ combo_cell_data_func (GtkCellLayout   *cell_layout,
   if (!info->func)
     return;
 
-  (*info->func) (cell_layout, cell, tree_model, iter, info->func_data);
-  
+  info->func (cell_layout, cell, tree_model, iter, info->func_data);
+
   if (GTK_IS_WIDGET (cell_layout))
     parent = gtk_widget_get_parent (GTK_WIDGET (cell_layout));
   
@@ -5214,7 +5214,7 @@ gtk_combo_box_get_active_text (GtkComboBox *combo_box)
   class = GTK_COMBO_BOX_GET_CLASS (combo_box);
 
   if (class->get_active_text)
-    return (* class->get_active_text) (combo_box);
+    return class->get_active_text (combo_box);
 
   return NULL;
 }
@@ -5353,7 +5353,7 @@ gtk_combo_box_destroy (GtkObject *object)
   gtk_combo_box_popdown (combo_box);
 
   if (combo_box->priv->row_separator_destroy)
-    (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+    combo_box->priv->row_separator_destroy (combo_box->priv->row_separator_data);
 
   combo_box->priv->row_separator_func = NULL;
   combo_box->priv->row_separator_data = NULL;
@@ -5720,7 +5720,7 @@ gtk_combo_box_set_row_separator_func (GtkComboBox                 *combo_box,
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
 
   if (combo_box->priv->row_separator_destroy)
-    (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+    combo_box->priv->row_separator_destroy (combo_box->priv->row_separator_data);
 
   combo_box->priv->row_separator_func = func;
   combo_box->priv->row_separator_data = data;

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 851fb1e986a94e8112530a0dbfb1480b67320d30..4bfd8d6285081c9c0f9587044aae76be793f1f7d 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -559,8 +559,8 @@ gtk_font_selection_finalize (GObject *object)
 
   if (fontsel->font)
     gdk_font_unref (fontsel->font);
-  
-  (* G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object);
 }
 
 static void

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 463dd098db99bba00466da0f8d0c5dbd1e27e385..60fbebd6294d1c436fbc965751f26775a0bc7a8b 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -312,9 +312,9 @@ gtk_invisible_constructor (GType                  type,
 {
   GObject *object;
 
-  object = (* G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor) (type,
-                                                                        n_construct_properties,
-                                                                        construct_params);
+  object = G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor (type,
+                                                                     n_construct_properties,
+                                                                     construct_params);
 
   gtk_widget_realize (GTK_WIDGET (object));
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index cb4c86d50e853dc4b40ca755d7c7992e2208b821..24d69f2355d50581102f01c1fbcf5226ccc24639 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -399,8 +399,7 @@ gtk_list_store_finalize (GObject *object)
       list_store->default_sort_data = NULL;
     }
 
-  /* must chain up */
-  (* G_OBJECT_CLASS (gtk_list_store_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_list_store_parent_class)->finalize (object);
 }
 
 /* Fulfill the GtkTreeModel requirements */

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 482179b032f380e4b726652c18aae4ccecb69f10..508255376e0fd8700ef279ad0bc171af31678176 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -744,7 +744,7 @@ gtk_text_tag_finalize (GObject *object)
   g_free (text_tag->name);
   text_tag->name = NULL;
 
-  (* G_OBJECT_CLASS (gtk_text_tag_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_text_tag_parent_class)->finalize (object);
 }
 
 static void

diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index be3665b321c3a5c1fa87ae7db0bd7340404dc944..1cf1a24a38bc9e2363240b1a67fef17dac18f374 100644 (file)
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -162,8 +162,8 @@ gtk_text_tag_table_finalize (GObject *object)
   g_slist_free (table->anonymous);
 
   g_slist_free (table->buffers);
-  
-  (* G_OBJECT_CLASS (gtk_text_tag_table_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (gtk_text_tag_table_parent_class)->finalize (object);
 }
 static void
 gtk_text_tag_table_set_property (GObject      *object,